ack, remove conflict marker

diff --git a/ChangeLog b/ChangeLog
index 0a968ba9c1b0496fb55c87377cef5b9589c39565..37794a8ed87e1b3c679c73095720cae8b0cc051e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
->>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0a968ba9c1b0496fb55c87377cef5b9589c39565..37794a8ed87e1b3c679c73095720cae8b0cc051e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
->>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a968ba9c1b0496fb55c87377cef5b9589c39565..37794a8ed87e1b3c679c73095720cae8b0cc051e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
->>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a968ba9c1b0496fb55c87377cef5b9589c39565..37794a8ed87e1b3c679c73095720cae8b0cc051e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
->>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a968ba9c1b0496fb55c87377cef5b9589c39565..37794a8ed87e1b3c679c73095720cae8b0cc051e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
->>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a968ba9c1b0496fb55c87377cef5b9589c39565..37794a8ed87e1b3c679c73095720cae8b0cc051e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
->>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments) 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a968ba9c1b0496fb55c87377cef5b9589c39565..37794a8ed87e1b3c679c73095720cae8b0cc051e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002  Owen Taylor  <otaylor@redhat.com>
        stuck prelighting combine some common code for button release
        and pressing Escape.
 
->>>>>>> 1.3038
 Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkclist.c (adjust_adjustments)